[SCM] jack-tools/master: Imported Debian patch 20101210-2.1

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Wed Oct 15 12:54:41 UTC 2014


The following commit has been merged in the master branch:
commit d76a650915919720f0817b5c4c1dece2c053c0ec
Author: Eric Dorland <eric at debian.org>
Date:   Sun Feb 16 15:27:09 2014 -0500

    Imported Debian patch 20101210-2.1

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index b408e6c..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/.pc
diff --git a/debian/changelog b/debian/changelog
index 4825280..bb00174 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+jack-tools (20101210-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/control, debian/rules: Switch to automake1.11. (Closes:
+    #724395)
+
+ -- Eric Dorland <eric at debian.org>  Sun, 16 Feb 2014 15:27:09 -0500
+
 jack-tools (20101210-2) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index f43e4f4..9688c51 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Arnout Engelen <arnouten at bzzt.net>,
  Jonas Smedegaard <dr at jones.dk>
 Build-Depends: cdbs,
  libtool,
- automake1.10,
+ automake1.11,
  autoconf,
  debhelper (>= 6),
  bzip2,
diff --git a/debian/rules b/debian/rules
index 5722266..88bb48b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,9 +18,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 DEB_AUTO_UPDATE_LIBTOOL = pre
-DEB_AUTO_UPDATE_ACLOCAL = 1.10
+DEB_AUTO_UPDATE_ACLOCAL = 1.11
 DEB_AUTO_UPDATE_AUTOCONF = 2.60
-DEB_AUTO_UPDATE_AUTOMAKE = 1.10
+DEB_AUTO_UPDATE_AUTOMAKE = 1.11
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/utils.mk
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 9cdfca9..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1,2 +0,0 @@
-unapply-patches
-abort-on-upstream-changes

-- 
jack-tools packaging



More information about the pkg-multimedia-commits mailing list