r61322 - in /trunk/libfile-userconfig-perl: debian/changelog debian/control debian/rules share/afile.conf

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

Author: jozef-guest
Date: Fri Aug  6 21:03:31 2010
New Revision: 61322

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=61322
Log:
restored the execution of afile.conf, removing it in override_dh_auto_install

Modified:
    trunk/libfile-userconfig-perl/debian/changelog
    trunk/libfile-userconfig-perl/debian/control
    trunk/libfile-userconfig-perl/debian/rules
    trunk/libfile-userconfig-perl/share/afile.conf   (contents, props changed)

Modified: trunk/libfile-userconfig-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libfile-userconfig-perl/debian/changelog?rev=61322&op=diff
==============================================================================
--- trunk/libfile-userconfig-perl/debian/changelog (original)
+++ trunk/libfile-userconfig-perl/debian/changelog Fri Aug  6 21:03:31 2010
@@ -1,15 +1,7 @@
-libfile-userconfig-perl (0.06-1) UNRELEASED; urgency=low
-
-  TODO:
-  the permissions of afile.conf are still wrong in the binary package;
-  changing them in svn doesn't help because the file and its permissions are
-  taken from the .orig.tar.gz
-  I see two solutions:
-  * if the file is needed: override_dh_fixperms with dh_fixperms and chmod
-  * if the file is useless: override_dh_auto_install with dh_autoinstall and
-    rm
-  I'm happy to help with the implementation; I just can't take the decision :)
+libfile-userconfig-perl (0.06-1) unstable; urgency=low
 
   * Initial Release. (Closes: #590999)
+  * override_dh_auto_install to remove dummy afile.conf file (upstream
+    Adam Kennedy suggested it, the file is used only for tests)
 
  -- Jozef Kutej <jozef at kutej.net>  Sat, 31 Jul 2010 09:16:21 +0200

Modified: trunk/libfile-userconfig-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libfile-userconfig-perl/debian/control?rev=61322&op=diff
==============================================================================
--- trunk/libfile-userconfig-perl/debian/control (original)
+++ trunk/libfile-userconfig-perl/debian/control Fri Aug  6 21:03:31 2010
@@ -1,7 +1,7 @@
 Source: libfile-userconfig-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7.0.50~)
 Build-Depends-Indep: perl, libfile-homedir-perl,
  libfile-remove-perl (>= 1.42), libfile-sharedir-perl (>= 1.00),
  libfile-copy-recursive-perl

Modified: trunk/libfile-userconfig-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libfile-userconfig-perl/debian/rules?rev=61322&op=diff
==============================================================================
--- trunk/libfile-userconfig-perl/debian/rules (original)
+++ trunk/libfile-userconfig-perl/debian/rules Fri Aug  6 21:03:31 2010
@@ -1,4 +1,12 @@
 #!/usr/bin/make -f
+
+PACKAGE = $(shell dh_listpackages)
+TMP     = $(CURDIR)/debian/$(PACKAGE)
+
+override_dh_auto_install:
+	dh_auto_install
+	rm $(TMP)/usr/share/perl5/auto/share/dist/File-UserConfig/afile.conf
+	rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/share/perl5/auto/share/dist/File-UserConfig
 
 %:
 	dh $@

Modified: trunk/libfile-userconfig-perl/share/afile.conf
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libfile-userconfig-perl/share/afile.conf?rev=61322&op=diff
==============================================================================
    (empty)

Propchange: trunk/libfile-userconfig-perl/share/afile.conf
------------------------------------------------------------------------------
    svn:executable = *