[Pkg-gtkpod-devel] r155 - gtkpod/branches/etch/debian

[Frank Lichtenheld]

Author: djpig
Date: 2006-11-30 23:17:51 +0100 (Thu, 30 Nov 2006)
New Revision: 155

Modified:
   gtkpod/branches/etch/debian/changelog
   gtkpod/branches/etch/debian/control
   gtkpod/branches/etch/debian/rules
Log:
Merge changes from trunk:
* Bump Standards-Version to 3.7.2 (no changes).
* Remove glade file symlinks on clean. Found by Martin Zobel-Helas.
  (Closes: #395120)


Modified: gtkpod/branches/etch/debian/changelog
===================================================================
--- gtkpod/branches/etch/debian/changelog	2006-11-30 22:13:25 UTC (rev 154)
+++ gtkpod/branches/etch/debian/changelog	2006-11-30 22:17:51 UTC (rev 155)
@@ -2,6 +2,9 @@
 
   * Add conflict against libgpod >= 0.4.0
     to quiten up the BTS a bit.
+  * Bump Standards-Version to 3.7.2 (no changes).
+  * Remove glade file symlinks on clean. Found by Martin Zobel-Helas.
+    (Closes: #395120)
 
  -- Frank Lichtenheld <djpig at debian.org>  Thu, 30 Nov 2006 23:12:32 +0100
 

Modified: gtkpod/branches/etch/debian/control
===================================================================
--- gtkpod/branches/etch/debian/control	2006-11-30 22:13:25 UTC (rev 154)
+++ gtkpod/branches/etch/debian/control	2006-11-30 22:17:51 UTC (rev 155)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Frank Lichtenheld <djpig at debian.org>
 Build-Depends: debhelper (>= 4.2.21), gettext, flex, autotools-dev, perl, libgtk2.0-dev, libglade2-dev, libid3tag0-dev, libgpod-dev
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
 
 Package: gtkpod
 Architecture: any

Modified: gtkpod/branches/etch/debian/rules
===================================================================
--- gtkpod/branches/etch/debian/rules	2006-11-30 22:13:25 UTC (rev 154)
+++ gtkpod/branches/etch/debian/rules	2006-11-30 22:17:51 UTC (rev 155)
@@ -27,7 +27,7 @@
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp gtkpod.1
+	rm -f build-stamp gtkpod.1 pixmaps/gtkpod.glade*
 	-$(MAKE) distclean
 	dh_clean