[Pkg-isocodes-devel] r1544 - trunk/iso-codes/debian

[toddy at alioth.debian.org]

Author: toddy
Date: 2008-08-04 13:30:21 +0000 (Mon, 04 Aug 2008)
New Revision: 1544

Modified:
   trunk/iso-codes/debian/changelog
   trunk/iso-codes/debian/control
   trunk/iso-codes/debian/rules
Log:
Remove iso-3166 udeb package from debian/control and debian/rules


Modified: trunk/iso-codes/debian/changelog
===================================================================
--- trunk/iso-codes/debian/changelog	2008-08-04 12:51:39 UTC (rev 1543)
+++ trunk/iso-codes/debian/changelog	2008-08-04 13:30:21 UTC (rev 1544)
@@ -1,3 +1,10 @@
+iso-codes (3.2-2) UNRELEASED; urgency=low
+
+  * Remove iso-3166 udeb package from debian/control and debian/rules.
+    The udeb is no longer needed by localechooser >= 2.04.
+
+ -- Tobias Quathamer <toddy at debian.org>  Mon, 04 Aug 2008 14:53:45 +0200
+
 iso-codes (3.2-1) unstable; urgency=low
 
   * New upstream release. This closes the following bugs from Debian

Modified: trunk/iso-codes/debian/control
===================================================================
--- trunk/iso-codes/debian/control	2008-08-04 12:51:39 UTC (rev 1543)
+++ trunk/iso-codes/debian/control	2008-08-04 13:30:21 UTC (rev 1544)
@@ -20,12 +20,3 @@
  list.
  .
  It also (more importantly) provides their translations in .po form.
-
-Package: iso-3166-udeb
-Architecture: all
-Section: debian-installer
-Priority: optional
-XC-Package-Type: udeb
-Description: provides iso_3166.tab file
- This package provides the iso_3166.tab file, which lists country names
- and their ISO-3166 codes.

Modified: trunk/iso-codes/debian/rules
===================================================================
--- trunk/iso-codes/debian/rules	2008-08-04 12:51:39 UTC (rev 1543)
+++ trunk/iso-codes/debian/rules	2008-08-04 13:30:21 UTC (rev 1544)
@@ -1,16 +1,10 @@
 #!/usr/bin/make -f
-# rules file for iso-codes. Uses debhelper.
 # GNU Copyright 2001 by Alastair McKinstry
-# Modifications Copyright 2006 by Tobias Toedter
+# Modifications Copyright 2006, 2008 by Tobias Quathamer
 
 # Uncomment this for verbose mode
 # export DH_VERBOSE=1
 
-VERSION=$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
-
-FILENAME=iso-3166-udeb_$(VERSION)_all.udeb
-
-
 config.status: configure
 	dh_testdir
 	./configure --prefix=/usr
@@ -42,20 +36,14 @@
 binary-indep: build install
 	dh_testdir
 	dh_testroot
-	mkdir -p `pwd`/debian/iso-3166-udeb/usr/share/iso-codes
-	cp iso_3166/iso_3166.tab  \
-		`pwd`/debian/iso-3166-udeb/usr/share/iso-codes
-	dh_installdocs -p iso-codes TODO README
-	dh_installchangelogs -p iso-codes ChangeLog
+	dh_installdocs TODO README
+	dh_installchangelogs ChangeLog
 	dh_compress
 	dh_fixperms
 	dh_installdeb
-	dh_gencontrol -p iso-codes
-	dh_gencontrol -- -fdebian/files~
-	dpkg-distaddfile $(FILENAME)  debian-installer optional
-	dh_md5sums -p iso-codes
-	dh_builddeb -p iso-codes -- -Z bzip2
-	dh_builddeb --filename=$(FILENAME)
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb -- -Z bzip2
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install