[Pkg-ocaml-maint-commits] r6456 - in /trunk/packages/planets/trunk/debian: ./ patches/ source/

treinen at users.alioth.debian.org treinen at users.alioth.debian.org
Mon Feb 8 20:35:53 UTC 2010 

Author: treinen
Date: Mon Feb  8 20:35:52 2010
New Revision: 6456

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=6456
Log:
source format 3.0

Added:
    trunk/packages/planets/trunk/debian/patches/buildflags
      - copied, changed from r6455, trunk/packages/planets/trunk/debian/patches/01_buildflags.patch
    trunk/packages/planets/trunk/debian/patches/fix_desktop_file
      - copied, changed from r6455, trunk/packages/planets/trunk/debian/patches/03_fix_desktop_file.patch
    trunk/packages/planets/trunk/debian/patches/german_translation
      - copied, changed from r6455, trunk/packages/planets/trunk/debian/patches/04_german_translation.patch
    trunk/packages/planets/trunk/debian/patches/series
    trunk/packages/planets/trunk/debian/patches/string_random_bodies
      - copied, changed from r6455, trunk/packages/planets/trunk/debian/patches/02_string_random_bodies.patch
    trunk/packages/planets/trunk/debian/source/
    trunk/packages/planets/trunk/debian/source/format
Removed:
    trunk/packages/planets/trunk/debian/patches/01_buildflags.patch
    trunk/packages/planets/trunk/debian/patches/02_string_random_bodies.patch
    trunk/packages/planets/trunk/debian/patches/03_fix_desktop_file.patch
    trunk/packages/planets/trunk/debian/patches/04_german_translation.patch
Modified:
    trunk/packages/planets/trunk/debian/changelog
    trunk/packages/planets/trunk/debian/control
    trunk/packages/planets/trunk/debian/rules

Modified: trunk/packages/planets/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/planets/trunk/debian/changelog?rev=6456&op=diff
==============================================================================
--- trunk/packages/planets/trunk/debian/changelog (original)
+++ trunk/packages/planets/trunk/debian/changelog Mon Feb  8 20:35:52 2010
@@ -1,3 +1,14 @@
+planets (0.1.13-10) unstable; urgency=low
+
+  * Convert to source format 3.0 (quilt)
+    - debian/paches quilt style
+    - no more patching in debian/rules
+    - added debian/source/format
+  * Standards-version 3.8.4 (no change)
+  * Recompile for ocaml 3.11.2
+
+ -- Ralf Treinen <treinen at debian.org>  Mon, 08 Feb 2010 21:35:07 +0100
+
 planets (0.1.13-9) unstable; urgency=low
 
   * debian/control: added Homepage

Modified: trunk/packages/planets/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/planets/trunk/debian/control?rev=6456&op=diff
==============================================================================
--- trunk/packages/planets/trunk/debian/control (original)
+++ trunk/packages/planets/trunk/debian/control Mon Feb  8 20:35:52 2010
@@ -8,7 +8,7 @@
  Ralf Treinen <treinen at debian.org>
 Build-Depends: cdbs, debhelper (>> 5.0.0), ocaml (>= 3.04), dh-ocaml
 Build-Depends-Indep: tk8.5-dev, camlp4
-Standards-Version: 3.8.2
+Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/planets
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/planets/trunk/
 Homepage: http://planets.homedns.org/

Copied: trunk/packages/planets/trunk/debian/patches/buildflags (from r6455, trunk/packages/planets/trunk/debian/patches/01_buildflags.patch)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/planets/trunk/debian/patches/buildflags?rev=6456&op=diff
==============================================================================
--- trunk/packages/planets/trunk/debian/patches/01_buildflags.patch (original)
+++ trunk/packages/planets/trunk/debian/patches/buildflags Mon Feb  8 20:35:52 2010
@@ -1,4 +1,5 @@
-# Description: Remove -custom build flag, replace -g with variable $(DEBUGFLAGS)
+Description: Remove -custom build flag, replace -g with variable $(DEBUGFLAGS)
+
 --- trunk/Makefile	2007-06-20 04:20:50.000000000 +0200
 +++ trunk.new/Makefile	2008-03-04 09:26:54.000000000 +0100
 @@ -15,7 +15,7 @@

Copied: trunk/packages/planets/trunk/debian/patches/fix_desktop_file (from r6455, trunk/packages/planets/trunk/debian/patches/03_fix_desktop_file.patch)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/planets/trunk/debian/patches/fix_desktop_file?rev=6456&op=diff
==============================================================================
--- trunk/packages/planets/trunk/debian/patches/03_fix_desktop_file.patch (original)
+++ trunk/packages/planets/trunk/debian/patches/fix_desktop_file Mon Feb  8 20:35:52 2010
@@ -1,4 +1,5 @@
-# Description: Fix properties in .desktop file
+Description: Fix properties in .desktop file
+
 --- trunk/planets.desktop	2007-06-20 04:20:50.000000000 +0200
 +++ trunk.new/planets.desktop	2008-03-04 09:36:58.000000000 +0100
 @@ -3,7 +3,7 @@

Copied: trunk/packages/planets/trunk/debian/patches/german_translation (from r6455, trunk/packages/planets/trunk/debian/patches/04_german_translation.patch)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/planets/trunk/debian/patches/german_translation?rev=6456&op=diff
==============================================================================
--- trunk/packages/planets/trunk/debian/patches/04_german_translation.patch (original)
+++ trunk/packages/planets/trunk/debian/patches/german_translation Mon Feb  8 20:35:52 2010
@@ -1,4 +1,5 @@
-# Description: Add German translation
+Description: Add German translation
+
 --- trunk/lstrings.ml	2008-03-04 09:37:57.000000000 +0100
 +++ trunk.new/lstrings.ml	2008-03-04 09:38:05.000000000 +0100
 @@ -140,6 +140,65 @@

Added: trunk/packages/planets/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/planets/trunk/debian/patches/series?rev=6456&op=file
==============================================================================
--- trunk/packages/planets/trunk/debian/patches/series (added)
+++ trunk/packages/planets/trunk/debian/patches/series Mon Feb  8 20:35:52 2010
@@ -1,0 +1,4 @@
+buildflags
+string_random_bodies
+fix_desktop_file
+german_translation

Copied: trunk/packages/planets/trunk/debian/patches/string_random_bodies (from r6455, trunk/packages/planets/trunk/debian/patches/02_string_random_bodies.patch)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/planets/trunk/debian/patches/string_random_bodies?rev=6456&op=diff
==============================================================================
--- trunk/packages/planets/trunk/debian/patches/02_string_random_bodies.patch (original)
+++ trunk/packages/planets/trunk/debian/patches/string_random_bodies Mon Feb  8 20:35:52 2010
@@ -1,5 +1,6 @@
-# Description: Fix crash in C locale due to un-i18n'ed string
-# Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=194402
+Description: Fix crash in C locale due to un-i18n'ed string
+Fixes-bug: 194402
+
 --- trunk/display.ml	2007-06-20 04:20:50.000000000 +0200
 +++ trunk.new/display.ml	2008-03-04 09:31:13.000000000 +0100
 @@ -237,7 +237,7 @@
@@ -11,7 +12,7 @@
  
      Options.add_option_live obox diameter_multiplier
        (new Options.float_entry_option
-diff -Nur -x '*.orig' -x '*~' trunk/lstrings.ml trunk.new/lstrings.ml
+
 --- trunk/lstrings.ml	2007-06-20 04:20:50.000000000 +0200
 +++ trunk.new/lstrings.ml	2008-03-04 09:31:13.000000000 +0100
 @@ -68,6 +68,7 @@

Modified: trunk/packages/planets/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/planets/trunk/debian/rules?rev=6456&op=diff
==============================================================================
--- trunk/packages/planets/trunk/debian/rules (original)
+++ trunk/packages/planets/trunk/debian/rules Mon Feb  8 20:35:52 2010
@@ -2,7 +2,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/ocaml.mk
 
 ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))

Added: trunk/packages/planets/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/planets/trunk/debian/source/format?rev=6456&op=file
==============================================================================
--- trunk/packages/planets/trunk/debian/source/format (added)
+++ trunk/packages/planets/trunk/debian/source/format Mon Feb  8 20:35:52 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)

More information about the Pkg-ocaml-maint-commits mailing list