tag 444507 pending thanks Ana Guerrero <[EMAIL PROTECTED]> (22/10/2007): > Could you send a real patch or just prepare a NMU? ;-)
Done, NMU sponsored by Ana, uploaded to DELAYED/2. Debdiff attached. Cheers, -- Cyril Brulebois
diff -u screem-0.16.1/debian/changelog screem-0.16.1/debian/changelog
--- screem-0.16.1/debian/changelog
+++ screem-0.16.1/debian/changelog
@@ -1,3 +1,17 @@
+screem (0.16.1-4.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add no-disable-deprecated.patch to avoid FTBFS due to the transition to
+ Gtk 2.12. It deletes the “-DGTK_DISABLE_DEPRECATED”,
+ “-DGNOME_DISABLE_DEPRECATED”, and “-DGNOMEUI_DISABLE_DEPRECATED” macros
+ from the DEPRECATION_FLAGS variable in configure{.ac,} (Closes: #444507).
+ * Menu transition: from “Apps/Editors” to “Applications/Editors”.
+ * Add desktop-files-cleanup.patch to remove the deprecated “Encoding” key,
+ per lintian. Also move the “Categories” key of the screem.desktop{,.in}
+ files from “Application;Development;” to “Development;WebDevelopment”.
+
+ -- Cyril Brulebois <[EMAIL PROTECTED]> Thu, 15 Nov 2007 09:09:26 +0100
+
screem (0.16.1-4.1) unstable; urgency=medium
* Non-maintainer upload during BSP.
diff -u screem-0.16.1/debian/screem.menu screem-0.16.1/debian/screem.menu
--- screem-0.16.1/debian/screem.menu
+++ screem-0.16.1/debian/screem.menu
@@ -1 +1 @@
-?package(screem):needs="X11" section="Apps/Editors" title="Screem"
command="/usr/bin/screem"
+?package(screem):needs="X11" section="Applications/Editors" title="Screem"
command="/usr/bin/screem"
only in patch2:
unchanged:
--- screem-0.16.1.orig/debian/patches/no-disable-deprecated.patch
+++ screem-0.16.1/debian/patches/no-disable-deprecated.patch
@@ -0,0 +1,22 @@
+--- screem-0.16.1.orig/configure 2007-11-15 09:17:22.000000000 +0100
++++ screem-0.16.1/configure 2007-11-15 09:17:36.000000000 +0100
+@@ -26003,7 +26003,7 @@
+
+
+
+-DEPRECATION_FLAGS="-DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED
-DGNOMEUI_DISABLE_DEPRECATED"
++DEPRECATION_FLAGS=""
+
+ CFLAGS="$SCREEM_CFLAGS -Wall $DEPRECATION_FLAGS $CFLAGS"
+
+--- screem-0.16.1.orig/configure.ac 2007-11-15 09:17:22.000000000 +0100
++++ screem-0.16.1/configure.ac 2007-11-15 09:17:31.000000000 +0100
+@@ -255,7 +255,7 @@
+ dnl being the blocker here, need a util function which does the
+ dnl same for utf-8
+
+-DEPRECATION_FLAGS="-DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED
-DGNOMEUI_DISABLE_DEPRECATED"
++DEPRECATION_FLAGS=""
+
+ CFLAGS="$SCREEM_CFLAGS -Wall $DEPRECATION_FLAGS $CFLAGS"
+ AC_SUBST(CFLAGS)
only in patch2:
unchanged:
--- screem-0.16.1.orig/debian/patches/desktop-files-cleanup.patch
+++ screem-0.16.1/debian/patches/desktop-files-cleanup.patch
@@ -0,0 +1,56 @@
+--- screem-0.16.1.orig/helpers/browsers-remote/epiphany.desktop
2007-11-15 16:20:43.000000000 +0100
++++ screem-0.16.1/helpers/browsers-remote/epiphany.desktop 2007-11-15
16:20:47.000000000 +0100
+@@ -1,6 +1,5 @@
+ [Desktop Entry]
+ Version=1.0
+-Encoding=UTF-8
+ Name=Epiphany
+ Exec=epiphany %p
+ TryExec=epiphany
+--- screem-0.16.1.orig/helpers/browsers-remote/konqueror.desktop
2007-11-15 16:20:43.000000000 +0100
++++ screem-0.16.1/helpers/browsers-remote/konqueror.desktop 2007-11-15
16:20:47.000000000 +0100
+@@ -1,6 +1,5 @@
+ [Desktop Entry]
+ Version=1.0
+-Encoding=UTF-8
+ Name=Konqueror
+ Exec=konqueror %p
+ TryExec=konqueror
+--- screem-0.16.1.orig/helpers/browsers-remote/opera.desktop 2007-11-15
16:20:43.000000000 +0100
++++ screem-0.16.1/helpers/browsers-remote/opera.desktop 2007-11-15
16:20:47.000000000 +0100
+@@ -1,6 +1,5 @@
+ [Desktop Entry]
+ Version=1.0
+-Encoding=UTF-8
+ Name=Opera
+ Exec=opera %p
+ TryExec=opera
+--- screem-0.16.1.orig/helpers/browsers/epiphany.desktop 2007-11-15
16:20:44.000000000 +0100
++++ screem-0.16.1/helpers/browsers/epiphany.desktop 2007-11-15
16:20:47.000000000 +0100
+@@ -1,6 +1,5 @@
+ [Desktop Entry]
+ Version=1.0
+-Encoding=UTF-8
+ Name=Epiphany (local)
+ Exec=epiphany %U
+ TryExec=epiphany
+--- screem-0.16.1.orig/screem.desktop 2007-11-15 16:27:50.000000000 +0100
++++ screem-0.16.1/screem.desktop 2007-11-15 16:27:54.000000000 +0100
+@@ -12,6 +12,6 @@
+ Icon=screem.png
+ Terminal=0
+ Type=Application
+-Categories=Application;Development;
++Categories=Development;WebDevelopment
+ StartupNotify=true
+
MimeType=text/html;application/xhtml+xml;text/xml;text/sgml;application/x-php;application/x-php-source;application/x-asp;text/vnd.wap.wml;image/svg;text/x-javascript;text/javascript;application/x-screem;application/x-screem-tag-tree;text/css;text/plain;text/x-perl;text/x-java;image/svg;text/x-php;text/mathml;text/x-dtd;text/x-sql
+--- screem-0.16.1.orig/screem.desktop.in 2007-11-15 17:10:14.000000000
+0100
++++ screem-0.16.1/screem.desktop.in 2007-11-15 17:10:28.000000000 +0100
+@@ -5,6 +5,6 @@
+ Icon=screem.png
+ Terminal=0
+ Type=Application
+-Categories=Application;Development;
++Categories=Development;WebDevelopment
+ StartupNotify=true
+
MimeType=text/html;application/xhtml+xml;text/xml;text/sgml;application/x-php;application/x-php-source;application/x-asp;text/vnd.wap.wml;image/svg;text/x-javascript;text/javascript;application/x-screem;application/x-screem-tag-tree;text/css;text/plain;text/x-perl;text/x-java;image/svg;text/x-php;text/mathml;text/x-dtd;text/x-sql
pgp9ZVE0Tc38j.pgp
Description: PGP signature
