[Pkg-cli-apps-commits] r5105 - in /packages/gshare/trunk/debian: README.source changelog control gshare.docs patches/03_invalid-cast.patch patches/15_potfiles_skip.patch patches/series rules

laney-guest at users.alioth.debian.org laney-guest at users.alioth.debian.org
Sun Sep 20 18:18:53 UTC 2009 

Author: laney-guest
Date: Sun Sep 20 18:18:53 2009
New Revision: 5105

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=5105
Log:
* Update autotoolisation, missing .mo files resp -8
* debian/rules, debian/control: Convert to DH7, convert patchsys to quilt 

Added:
    packages/gshare/trunk/debian/README.source
    packages/gshare/trunk/debian/gshare.docs
    packages/gshare/trunk/debian/patches/15_potfiles_skip.patch
    packages/gshare/trunk/debian/patches/series
Modified:
    packages/gshare/trunk/debian/changelog
    packages/gshare/trunk/debian/control
    packages/gshare/trunk/debian/patches/03_invalid-cast.patch
    packages/gshare/trunk/debian/rules

Added: packages/gshare/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gshare/trunk/debian/README.source?rev=5105&op=file
==============================================================================
--- packages/gshare/trunk/debian/README.source (added)
+++ packages/gshare/trunk/debian/README.source Sun Sep 20 18:18:53 2009
@@ -1,0 +1,57 @@
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+                export QUILT_PATCHES=debian/patches
+        fi
+    done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+    quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+    quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches.  Then, for every file that will be modified by this patch,
+run:
+
+    quilt add <file>
+
+before editing those files.  You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly.  After editing the files, run:
+
+    quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+    quilt import -P <patch> /path/to/patch
+    quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches.  The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+    quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.

Modified: packages/gshare/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gshare/trunk/debian/changelog?rev=5105&op=diff
==============================================================================
--- packages/gshare/trunk/debian/changelog (original)
+++ packages/gshare/trunk/debian/changelog Sun Sep 20 18:18:53 2009
@@ -6,12 +6,12 @@
     + Bump Standards-Version to 3.8.3
 
   [ Iain Lane ]
-  * debian/patches/10_mono-posix-20.patch, debian/patches/99_autoreconf.patch:
-    Patch configure.ac to look for 2.0 Mono.Posix instead of 1.0 as the latter
-    is no longer installed. Refresh autotools to pick this up.
-    (Closes: #533972)
+  * debian/patches/10_mono-posix-20.patch: Patch configure.ac to look for
+    2.0 Mono.Posix instead of 1.0 as the latter is no longer installed.
+    Refresh autotools to pick this up. (Closes: #533972)
+  * debian/rules, debian/control: Convert to DH7, convert patchsys to quilt 
 
- -- Iain Lane <laney at ubuntu.com>  Sat, 19 Sep 2009 17:13:00 +0100
+ -- Iain Lane <laney at ubuntu.com>  Sun, 20 Sep 2009 19:17:09 +0100
 
 gshare (0.94-8) unstable; urgency=low
 

Modified: packages/gshare/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gshare/trunk/debian/control?rev=5105&op=diff
==============================================================================
--- packages/gshare/trunk/debian/control (original)
+++ packages/gshare/trunk/debian/control Sun Sep 20 18:18:53 2009
@@ -3,13 +3,18 @@
 Priority: optional
 Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
 Uploaders: Sebastian Dröge <slomo at debian.org>
-Build-Depends: debhelper (>= 5),
- cdbs,
+Build-Depends: debhelper (>= 7.0.50~),
+ quilt (>= 0.46-7~),
  cli-common-dev (>= 0.4.4),
+ autotools-dev,
+ automake,
+ intltool,
+ libtool,
  libmono-dev (>= 1.1.10),
  mono-devel (>= 2.0.1),
  libmono2.0-cil,
  libgtk2.0-cil (>= 2.8),
+ libgconf2-dev,
  libgconf2.0-cil (>= 2.8),
  libglade2.0-cil (>= 2.6),
  libgnome2.24-cil (>= 2.24),

Added: packages/gshare/trunk/debian/gshare.docs
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gshare/trunk/debian/gshare.docs?rev=5105&op=file
==============================================================================
--- packages/gshare/trunk/debian/gshare.docs (added)
+++ packages/gshare/trunk/debian/gshare.docs Sun Sep 20 18:18:53 2009
@@ -1,0 +1,1 @@
+README

Modified: packages/gshare/trunk/debian/patches/03_invalid-cast.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gshare/trunk/debian/patches/03_invalid-cast.patch?rev=5105&op=diff
==============================================================================
--- packages/gshare/trunk/debian/patches/03_invalid-cast.patch (original)
+++ packages/gshare/trunk/debian/patches/03_invalid-cast.patch Sun Sep 20 18:18:53 2009
@@ -1,5 +1,5 @@
---- src/gsharelib/consts.cs.in.old	2008-01-05 07:04:15.000000000 +0100
-+++ src/gsharelib/consts.cs.in	2008-01-05 07:04:24.000000000 +0100
+--- a/src/gsharelib/consts.cs.in.old	2008-01-05 07:04:15.000000000 +0100
++++ b/src/gsharelib/consts.cs.in	2008-01-05 07:04:24.000000000 +0100
 @@ -170,13 +170,6 @@
  
          }

Added: packages/gshare/trunk/debian/patches/15_potfiles_skip.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gshare/trunk/debian/patches/15_potfiles_skip.patch?rev=5105&op=file
==============================================================================
--- packages/gshare/trunk/debian/patches/15_potfiles_skip.patch (added)
+++ packages/gshare/trunk/debian/patches/15_potfiles_skip.patch Sun Sep 20 18:18:53 2009
@@ -1,0 +1,12 @@
+Contains untranslataed strings - gettext must be told to skip it
+
+Index: gshare-0.94/po/POTFILES.skip
+===================================================================
+--- gshare-0.94.orig/po/POTFILES.skip	2009-09-20 19:10:07.368633455 +0100
++++ gshare-0.94/po/POTFILES.skip	2009-09-20 19:10:10.180633861 +0100
+@@ -3,4 +3,4 @@
+ _darcs/current/src/gshare-manager/manager.cs
+ _darcs/current/src/gshared/daemon.cs
+ _darcs/current/src/resources/gshare-manager.glade
+-
++src/gsharelib/consts.cs

Added: packages/gshare/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gshare/trunk/debian/patches/series?rev=5105&op=file
==============================================================================
--- packages/gshare/trunk/debian/patches/series (added)
+++ packages/gshare/trunk/debian/patches/series Sun Sep 20 18:18:53 2009
@@ -1,0 +1,6 @@
+01_missing-file.patch
+02_external-ndesk-dbus.patch
+03_invalid-cast.patch
+04_firefox-permission-denied-crash.patch
+10_mono-posix-20.patch
+15_potfiles_skip.patch

Modified: packages/gshare/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gshare/trunk/debian/rules?rev=5105&op=diff
==============================================================================
--- packages/gshare/trunk/debian/rules (original)
+++ packages/gshare/trunk/debian/rules Sun Sep 20 18:18:53 2009
@@ -1,22 +1,20 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cli-common/cli.make
 
-DEB_CONFIGURE_EXTRA_FLAGS += MCS=/usr/bin/csc
+override_dh_auto_configure:
+	# buggy makefile.am
+	mkdir m4
+	intltoolize --force
+	autoreconf -f -i
+	dh_auto_configure -- MCS=/usr/bin/mono-csc
 
-export MONO_SHARED_DIR=$(CURDIR)
+override_dh_auto_clean:
+	rm -f src/gshared/AssemblyInfo.cs
+	# clean up from autoreconf
+	find . -name Makefile.in -delete
+	rm -rf configure autom4te.cache m4
+	dh_auto_clean
 
-install/gshare::
-	# remove scrollkeeper stuff
-	rm -rf debian/gshare/var
-	
-common-binary-predeb-indep::
-	dh_clifixperms
-	dh_clideps -d
-
-clean::
-	rm -rf $(MONO_SHARED_DIR)/.wapi
-	rm -f src/gshared/AssemblyInfo.cs
-
+%:
+	dh --with quilt $@

More information about the Pkg-cli-apps-commits mailing list