summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2012-01-30 01:44:43 +0000
committerIgor Pashev <pashev.igor@gmail.com>2012-01-30 01:44:43 +0000
commit7bc2fa0c0c7c0e73c375cad2b84d021b2e5b50af (patch)
tree52ab697cf6e61a6f66b37045070f7f5d9a249d50
parent9ee0565d98150b76fe4871a3e1342fa598000f2a (diff)
downloadattr-7bc2fa0c0c7c0e73c375cad2b84d021b2e5b50af.tar.gz
Use native formatHEADmaster
-rw-r--r--configure.in1
-rw-r--r--debian/changelog5
-rw-r--r--debian/patches/12-643587-attr-autoconf-version-check.patch20
-rw-r--r--debian/patches/series1
-rwxr-xr-xdebian/rules2
-rw-r--r--debian/source/format2
6 files changed, 7 insertions, 24 deletions
diff --git a/configure.in b/configure.in
index dd29f97..439ecc2 100644
--- a/configure.in
+++ b/configure.in
@@ -13,6 +13,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
+AC_PREREQ([2.59])
AC_INIT(include/attributes.h)
AC_CONFIG_AUX_DIR([.])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/debian/changelog b/debian/changelog
index 9cb65a1..660ab06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-attr (1:2.4.46-5+dyson2) unstable; urgency=low
+attr (1:2.4.46+dyson2) unstable; urgency=low
* Fixed attributes listing
+ * Use native format
- -- Igor Pashev <pashev.igor@gmail.com> Sun, 29 Jan 2012 21:27:28 +0000
+ -- Igor Pashev <pashev.igor@gmail.com> Mon, 30 Jan 2012 01:40:04 +0000
attr (1:2.4.46-5+dyson1) unstable; urgency=low
diff --git a/debian/patches/12-643587-attr-autoconf-version-check.patch b/debian/patches/12-643587-attr-autoconf-version-check.patch
deleted file mode 100644
index 6941ea0..0000000
--- a/debian/patches/12-643587-attr-autoconf-version-check.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=643587
-
-Description: Fix for incompatibility with autoconf2.13
- This package will not build if autconf2.13 is installed.
- Adding AC_PREREQ allows the automatic checks to run the correct
- version of autconf, whichever is installed, or to get a clear error
- message about the problem.
-
-Author: Wookey <wookey@linaro.org>
-
---- attr-2.4.44.orig/configure.in
-+++ attr-2.4.44/configure.in
-@@ -13,6 +13,7 @@
- # You should have received a copy of the GNU General Public License
- # along with this program. If not, see <http://www.gnu.org/licenses/>.
- #
-+AC_PREREQ([2.59])
- AC_INIT(include/attributes.h)
- AC_CONFIG_AUX_DIR([.])
- AC_CONFIG_MACRO_DIR([m4])
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 610bb4a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-12-643587-attr-autoconf-version-check.patch
diff --git a/debian/rules b/debian/rules
index 32c0654..9b38739 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,6 +55,8 @@ clean:
$(MAKE) distclean
-rm -rf $(dirme) $(dirdev) $(dirlib) debian/tmp
-rm -f debian/*substvars debian/files* debian/*.debhelper
+ -rm -rf debian/*.debhelper.log
+ -rm -rf configure.lineno
binary-indep:
diff --git a/debian/source/format b/debian/source/format
index 163aaf8..89ae9db 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)