Merge latest changes from master
authorJulien Valroff <julien@kirya.net>
Thu, 9 Dec 2010 20:21:28 +0000 (21:21 +0100)
committerJulien Valroff <julien@kirya.net>
Thu, 9 Dec 2010 20:21:28 +0000 (21:21 +0100)
debian/control
debian/source/local-options

index dff05ae..a26fadb 100644 (file)
@@ -1,7 +1,7 @@
 Source: pino
 Section: net
 Priority: optional
-Maintainer: Julien Valroff <julien@kirya.net>
+Maintainer: Julien Valroff <julien@debian.org>
 Standards-Version: 3.9.1
 Build-Depends: debhelper (>= 7.0.50~),
                cmake (>= 2.6.0),
@@ -24,7 +24,6 @@ Build-Depends: debhelper (>= 7.0.50~),
 Homepage: http://pino-app.appspot.com/
 Vcs-Git: git://git.kirya.net/git/pino.git
 Vcs-Browser: http://git.kirya.net/?p=pino.git;a=summary
-DM-Upload-Allowed: yes
 
 Package: pino
 Architecture: any
index 4aceb10..433806b 100644 (file)
@@ -1 +1,2 @@
 unapply-patches
+abort-on-uptream-changes