Skip to content

Commit

Permalink
merge upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
mmaechler committed Oct 28, 2015
2 parents cae52ba + cd60abf commit 95b6df3
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
12 changes: 12 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
ess (15.09.1-1) unstable; urgency=low

* New upstream version released today

* debian/emacsen-install: Call gzip with '-f' to ensure in-place upgrades
(Closes: #802953)

* debian/control: Shift Maintainer: address from ess-debian list to me,
remove now-redundant Uploaders: field (Closes: #803003)

-- Dirk Eddelbuettel <[email protected]> Mon, 26 Oct 2015 19:22:28 -0500

ess (15.09-1) unstable; urgency=low

* New upstream version
Expand Down
3 changes: 1 addition & 2 deletions debian/control
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
Source: ess
Section: gnu-r
Priority: optional
Maintainer: ESS Debian Maintainers <[email protected]>
Uploaders: Dirk Eddelbuettel <[email protected]>
Maintainer: Dirk Eddelbuettel <[email protected]>
Standards-Version: 3.9.6
Build-Depends: debhelper (>= 7.0.0)
Build-Depends-Indep: texlive-base, texlive-latex-base, texlive-latex-recommended, texlive-latex-extra, texlive-generic-recommended, texlive-extra-utils, texinfo, autotools-dev
Expand Down
2 changes: 1 addition & 1 deletion debian/emacsen-install
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ EOF
touch Install.log
${FLAVOR} ${FLAGS} ${FILES} >> Install.log 2>&1
${FLAVOR} ${FLAGS} ess.el >> Install.log 2>&1
gzip -9v Install.log
gzip -9fv Install.log
#rm -f *.el path.el


Expand Down

0 comments on commit 95b6df3

Please sign in to comment.