r7692 - in /trunk/libxml-atom-perl/debian: changelog control rules

[hanska-guest at users.alioth.debian.org]

Author: hanska-guest
Date: Tue Sep 18 07:54:49 2007
New Revision: 7692

URL: http://svn.debian.org/wsvn/?sc=1&rev=7692
Log:
Still another merge to undo my work

Modified:
    trunk/libxml-atom-perl/debian/changelog
    trunk/libxml-atom-perl/debian/control
    trunk/libxml-atom-perl/debian/rules

Modified: trunk/libxml-atom-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libxml-atom-perl/debian/changelog?rev=7692&op=diff
==============================================================================
--- trunk/libxml-atom-perl/debian/changelog (original)
+++ trunk/libxml-atom-perl/debian/changelog Tue Sep 18 07:54:49 2007
@@ -1,22 +1,8 @@
-libxml-atom-perl (0.27-1) UNRELEASED; urgency=low
+libxml-atom-perl (0.25-3) UNRELEASED; urgency=low
 
-  [ gregor herrmann ]
   * Don't ignore return value of ($MAKE) distclean.
 
-  [ David Paleino ]
-  * New upstream version (Closes: #442817)
-  * debian/control:
-    - Added myself to Uploaders field
-    - Added Homepage field
-    - Fixed dependency on libxml-xml-perl to (>= 1.64) from (>= 1.54)
-  * debian/rules:
-    - Using new approach to build the package (using environment variables)
-    - Moved $(MAKE) test under the build target, from the install
-    - Removed useless comments
-    - Some general cleanup
-  * 
-
- -- David Paleino <d.paleino at gmail.com>  Mon, 17 Sep 2007 19:18:24 +0200
+ -- gregor herrmann <gregor+debian at comodo.priv.at>  Fri, 20 Jul 2007 17:04:46 +0200
 
 libxml-atom-perl (0.25-2) unstable; urgency=low
 

Modified: trunk/libxml-atom-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libxml-atom-perl/debian/control?rev=7692&op=diff
==============================================================================
--- trunk/libxml-atom-perl/debian/control (original)
+++ trunk/libxml-atom-perl/debian/control Tue Sep 18 07:54:49 2007
@@ -4,21 +4,15 @@
 Build-Depends: debhelper (>= 5.0.0), dpatch
 Build-Depends-Indep: perl (>= 5.8.0-7), libxml-libxml-perl (>=1.54), liburi-perl, libwww-perl, liblwp-authen-wsse-perl, libdigest-sha1-perl, libdatetime-perl, libhtml-parser-perl, libxml-libxslt-perl, libclass-data-inheritable-perl, libxml-xpath-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Tim Peeler <thp at linuxforce.net>, gregor herrmann <gregor+debian at comodo.priv.at>, 
- Carlo Segre <segre at debian.org>, Krzysztof Krzyzaniak (eloy) <eloy at debian.org>,
- Rene Mayorga <rmayorga at debian.org.sv>, David Paleino <d.paleino at gmail.com>
+Uploaders: Tim Peeler <thp at linuxforce.net>, gregor herrmann <gregor+debian at comodo.priv.at>, Carlo Segre <segre at debian.org>, Krzysztof Krzyzaniak (eloy) <eloy at debian.org>, Rene Mayorga <rmayorga at debian.org.sv>
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libxml-atom-perl/
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-atom-perl/
 
 Package: libxml-atom-perl
 Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, libxml-libxml-perl (>= 1.64), liblwp-authen-wsse-perl, liburi-perl,
- libwww-perl, libdigest-sha1-perl, libhtml-parser-perl, libxml-libxslt-perl, libdatetime-perl, 
- libclass-data-inheritable-perl, libxml-xpath-perl
+Depends: ${perl:Depends}, ${misc:Depends}, libxml-libxml-perl (>= 1.54), liblwp-authen-wsse-perl, liburi-perl, libwww-perl, libdigest-sha1-perl, libhtml-parser-perl, libxml-libxslt-perl, libdatetime-perl, libclass-data-inheritable-perl, libxml-xpath-perl
 Description:  Atom feed and API implementation
  Atom is a syndication, API, and archiving format for weblogs and other
  data. XML::Atom implements the feed format as well as a client for the
  API.
- .
- Homepage: http://search.cpan.org/dist/XML-Atom/

Modified: trunk/libxml-atom-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libxml-atom-perl/debian/rules?rev=7692&op=diff
==============================================================================
--- trunk/libxml-atom-perl/debian/rules (original)
+++ trunk/libxml-atom-perl/debian/rules Tue Sep 18 07:54:49 2007
@@ -34,19 +34,17 @@
 build-stamp: patch-stamp
 	dh_testdir
 
-	$(PERL) Makefile.PL \
-		INSTALLDIRS=vendor \
-		VENDORARCHEXP=/usr/share/perl5 \
-		INSTALLVENDORARCH=/usr/share/perl5
+	# Add commands to compile the package here
+	$(PERL) Makefile.PL INSTALLDIRS=vendor
 	$(MAKE) OPTIMIZE="$(CFLAGS)"
-	$(MAKE) test
 	
-	touch $@
+	touch build-stamp
 
 clean: unpatch
 	dh_testdir
 	dh_testroot
 
+	# Add commands to clean up after the build process here
 	[ ! -f Makefile ] || $(MAKE) distclean
 	
 	dh_clean build-stamp install-stamp
@@ -57,14 +55,24 @@
 	dh_testroot
 	dh_clean -k
 
+	$(MAKE) test
 	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
 	
-	touch $@
+	# As this is a architecture independent package, we are not supposed to install
+	# stuff to /usr/lib. MakeMaker creates the dirs, we delete them from the deb:
+	rmdir --ignore-fail-on-non-empty --parents $(TMP)/usr/lib/perl5
+
+	touch install-stamp
 
 binary-arch:
+# We have nothing to do by default.
+
 binary-indep: build install
 	dh_testdir
 	dh_testroot
+#	dh_installcron
+#	dh_installmenu
+#	dh_installexamples
 	dh_installdocs README
 	dh_installchangelogs Changes
 	dh_perl